ACCUMULO-921 -merging 1427864



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