ACCUMULO-3135 Fix javadoc misuse of link
Merge branch '1.5' into 1.6
ACCUMULO-3190 Fix deprecation warning
Merge branch '1.6'
WIP