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
ACCUMULO-3175 Include scaling factor in sleep statement
Merge branch '1.6.2-SNAPSHOT'
ACCUMULO-2913 Add more scaling timeouts
ACCUMULO-3175 Fix some findbugs warnings
Merge branch '1.6.2-SNAPSHOT'
ACCUMULO-3160 Remove duplicate code from ConfigurableMacIT.

Also changes the test from sharing a MAC to starting a new one
for each test method which better isolates test failures.
Merge branch '1.6.2-SNAPSHOT'

Conflicts:
	test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java