ACCUMULO-3228 fix possible resource leaks
Merge branch '1.6' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6