ACCUMULO-3108 Remove timeout attribute to allow timeout.factor to be used.
Merge branch '1.6.1-SNAPSHOT'