ACCUMULO-3110 ACCUMULO-3108 Fix defaultTimeoutSeconds to be class-level, not method-level
Merge branch '1.6.1-SNAPSHOT'