ACCUMULO-3167 Fix javadoc typo/tag usage
Merge branch '1.6'