ACCUMULO-2087 ACCUMULO-2086 Fixing formatting.