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'