ACCUMULO-1417, ACCUMULO-970 1.5 branch changes merged to trunk

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