Fixes for previous updates.
HCOLL-171 Simplify hashing.
Fix a generic in Javadoc.
Port to windows
Tweek tests for windows.