ACCUMULO-1478 applying Mike Drob's patch

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