ACCUMULO-1211 made formatting more consistent

git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.5@1462259 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-1142 revert inadvertent check-in

git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.5@1462467 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-1142 revert inadvertent check-in

git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1462469 13f79535-47bb-0310-9956-ffa450edef68