ACCUMULO-2666  Set a scalable default timeout for integration tests based on the functional test's MAC.
Merge branch '1.6.0-SNAPSHOT'