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'