ACCUMULO-3175 Move test annotation timeouts into the Rule with scaling factor.

Also include the scaling factor in some sleep/wait statements in tests.
Merge branch '1.6.2-SNAPSHOT'

Conflicts:
	test/src/test/java/org/apache/accumulo/test/BadDeleteMarkersCreatedIT.java