ACCUMULO-2361 IT to reproduce
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	server/master/src/main/java/org/apache/accumulo/master/tableOps/DeleteTable.java
Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.5.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.1-SNAPSHOT
ACCUMULO-2361 made test a functional SimpleIT for 1.6 and later
Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.6.0-SNAPSHOT'