Eng 5502 client java6

Merge hashinator-related changes to master.