Patches for updating the fingerprint index of the builder3d

This fixes a failing unit test.

First, there is a bit of code clean up:

0002-Some-code-clean-up-generics-and-one-variable-now-sta.patch
0003-Code-clean-up-use-generics.patch
0005-Fixed-order-in-assertion-expected-value-comes-first.patch

And patches to use the hybridization fingerprinter, and update the expected fingerprints according to what they give now. (These hybridization FPs should be much more stable...)

0001-Use-the-HybridizationFingerprinter-faster-not-suffer.patch
0004-Updated-the-expected-fingerprints-for-the-hybridizat.patch

They are for cdk-1-4.x and should be applied in the order 0001, 0002, etc...