ACCUMULO-2324 synchronize on plain old Object, and not a String
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT