ACCUMULO-3286 Clean up some assertions in ConditionalWriterIT
ACCUMULO-3243 Remove explicit timeout on ShutdownIT
ACCUMULO-3243 Add missing defaultTimeoutSeconds and remove method-level timeout
Merge branch '1.6'