ACCUMULO-1190 applying Corey's patch

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

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