ACCUMULO-1998 fix warning about an unclosed resource.
Merge branch '1.6.0-SNAPSHOT'