ACCUMULO-847 merge back to 1.4 branch

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