ACCUMULO-2713 fixing Michael Allen's patch and adding test
Merge branch '1.6.0-SNAPSHOT'