ACCUMULO-788 - merging 1428054


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