Fixed #1003: Performance counter naming issue
Cosmetic (remove blank).
Commit work-in-progress improvements to merging map unit test.
Fixed compilation problem
Fixed problem when compiling with Boost V1.55