Update hash_map namespace
Merge remote-tracking branch 'mhart/update-hashmap-namespace'