Fixes #1212.
Fixes #1211.
Fixes #1216.
Merge pull request #1242 from mdogan/fix/3.1/client-test-issues

ClientMapTest fixes..