ACCUMULO-3112 Nuke the test, it's really not worthwhile.
Merge branch '1.6.1-SNAPSHOT'