ACCUMULO-1488 backported to 1.5 branch

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