ACCUMULO-1183 applying patch from Corey Nolet

git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.5@1457724 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-1183 applying patch from Corey Nolet

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