ACCUMULO-1160 - some more cleaned up code



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