ACCUMULO-3837 merge to 1.7
tree: 57b5d6c9315332270dc297681f5d00cf5cdf6ad8
  1. src/
  2. .gitignore
  3. pom.xml