ACCUMULO-3408 Fix whitespace complaints
Merge branch '1.6'