Polish concurrent gaugeLocks map access

See gh-1995
Merge branch '1.1.x'