ACCUMULO-787 - Merging 1427919



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