ACCUMULO-3110 clean up some more timeout related issues with some problematic ITs
Merge branch '1.6.1-SNAPSHOT'
ACCUMULO-3110 ACCUMULO-3108 Fix defaultTimeoutSeconds to be class-level, not method-level
Merge branch '1.6.1-SNAPSHOT'
Revert "ACCUMULO-3110 ACCUMULO-3108 Fix defaultTimeoutSeconds to be class-level, not method-level"

This reverts commit c566e931b2bad8cb7667b4f8e67992e2a5f9a060.

Timeout rule *is* applied per method in a class, not the sum of all methods in the class.
Merge branch '1.6.1-SNAPSHOT'
ACCUMULO-3106 Improve the warning message about gc pauses
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Merge branch '1.6.1-SNAPSHOT'

Conflicts:
	server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java