ACCUMULO-2592 Fix incorrect javadoc
Merge branch '1.6.0-SNAPSHOT'