AUI-1172 Map hashcode for object can conflict with string hashcode
Merge branch 'master' into master-deprecated