ACCUMULO-1392 - I seemed to have kaiboshed this in the original merge



git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.5@1480465 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-1392 - I seemed to have kaiboshed this in the original merge



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