ACCUMULO-804 more testing finds more 2.0 issues

git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.5@1458529 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-804 more testing finds more 2.0 issues

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