ACCUMULO-2361 clean-up at the end of the test
ACCUMULO-1961 fixing warnings