ACCUMULO-3108 Remove timeout attribute to allow timeout.factor to be used.
Merge branch '1.6.1-SNAPSHOT'
ACCUMULO-3109 Stabilize MonitorLoggingIT some more

We only need one tserver (reduce ZK watchers to fire),
remove the timeout attribute so timeout.factor works,
and sleep before we cause the error so the tserver is
likely to have seen the updated log-fwding addr.
Merge branch '1.6.1-SNAPSHOT'
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
ACCUMULO-2645 add (very) basic data about running scans to identify run-away queries
Merge branch '1.6.1-SNAPSHOT'
ACCUMULO-3112 Nuke the test, it's really not worthwhile.
Merge branch '1.6.1-SNAPSHOT'
ACCUMULO-3110 converted ConditionalWriterIT to use defaultTimeoutSeconds
ACCUMULO-3111 added some retries when checking the number of splits after merging in MetaSplitIT
Merge branch '1.6.1-SNAPSHOT'