ACCUMULO-2361 clean-up: remove commented code
ACCUMULO-2361 integration test should be int src/test/java
ACCUMULO-2361 clean-up at the end of the test
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT

Conflicts:
	test/src/test/java/org/apache/accumulo/test/functional/DeleteTableDuringSplitIT.java
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-1961 fixing warnings
ACCUMULO-1961 fixing warnings
Merge branch '1.6.0-SNAPSHOT'