Starting to remove merging_map
Fix runtime errors caused by recent changes
Removing util::merging_map from the server side as well.
Removing merging_map test
Merge pull request #1276 from STEllAR-GROUP/remove_merging_map

Remove merging map