Remove update JARs
Fix CollationKey creation - fixes #753
Adding a TODO
Update Apache HTTP client JARs to 4.2.5