ACCUMULO-3263 forgot to shutdown the threadpool
Merge branch '1.6'