ACCUMULO-2438 Timeout is a little too tight on a busy system.
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
	test/src/test/java/org/apache/accumulo/test/DeleteRowsTest.java
Merge branch '1.6.0-SNAPSHOT'