ACCUMULO-2560 Fix broken unit test
Merge branch '1.6.1-SNAPSHOT'