Applying patch ACCUMULO-1401


git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.5@1481924 13f79535-47bb-0310-9956-ffa450edef68
Applying patch ACCUMULO-1401


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