ACCUMULO-259 more refinement after testing and merging


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