ACCUMULO-1053 pull simplified Repo from trunk

git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/1.5@1448387 13f79535-47bb-0310-9956-ffa450edef68
ACCUMULO-1053 merge in changes to 1.5 branch

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