ACCUMULO-3045 Remove unnecessary method Overrides and bad formatting
Merge branch '1.6.1-SNAPSHOT'