ACCUMULO-2105 cannot close instance
Merge branch '1.6.0-SNAPSHOT'