ACCUMULO-1375 Pull the changes from 1.4 (which came from 1.6) to 1.5


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