ACCUMULO-1557 applying Jonathan Hsieh's patch

git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.5@1500878 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-1557 applying Jonathan Hsieh's patch

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