ACCUMULO-3408 Fix whitespace complaints