ACCUMULO-3318 Remove extraneous javadoc tag without description
Merge branch '1.6'
WIP
WIP
WIP
WIP
WIP
WIP