ACCUMULO-3182 Fix javadoc (link to non-visible member)
Merge branch '1.6'