ACCUMULO-2503 add formatter tests
Merge branch '1.6.0-SNAPSHOT'