ACCUMULO-1494 Fix warnings and formatting from patch