C++ fix: add std::map that corresponds to scala hashmap
Merge remote-tracking branch 'origin/cpp-fix' into wip-clusters2