ACCUMULO-3228 Remove additional resource leak warnings
Merge branch '1.6'
ACCUMULO-3425 Cleanup javadoc warnings