ACCUMULO-2507 add debugging information, and timeout for reader thread to pull in all the output of the tserver
Merge branch '1.6.0-SNAPSHOT'
ACCUMULO-2508 Add delay after dropping user in security randomwalk
Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT

Conflicts:
	test/src/main/java/org/apache/accumulo/test/randomwalk/security/DropUser.java
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.6.0-SNAPSHOT'

Conflicts:
	test/src/main/java/org/apache/accumulo/test/randomwalk/security/DropUser.java