ACCUMULO-1144 merged patch from Kevin Faro

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