ACCUMULO-1498 ensure 1.4 merges cleanly to 1.5

git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.5@1492947 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-1498 Fix more svn mergeinfo from 1.4 to 1.5

git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.5@1492948 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-1498 Ensure 1.5 branch merges cleanly to trunk

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