ACCUMULO-2438 Rename the test so that surefire doesn't pick it up as a unit test
Merge branch '1.6.0-SNAPSHOT'