Applying patch ACCUMULO-1380


git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.5@1481699 13f79535-47bb-0310-9956-ffa450edef68
Merging ACCUMULO-1380 from 1.5


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