ACCUMULO-3072 Split the test into multiple methods and use proper assertions
Merge branch '1.6.1-SNAPSHOT'

Conflicts:
	test/src/test/resources/log4j.properties