ACCUMULO-2857 Messed up the merge
Merge branch '1.6.1-SNAPSHOT'