test fix on ClientMapStoreTest. fixes #3416
Merge pull request #3424 from sancar/testFix/clientMapStore/maint3.x

test fix on ClientMapStoreTest. fixes #3416