ACCUMULO-2675 Clean up creation of temp test files/dirs
Merge branch '1.6.0-SNAPSHOT'

Conflicts:
	core/src/test/java/org/apache/accumulo/core/client/mock/MockNamespacesTest.java