ACCUMULO-3048 More CHANGES
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT