ACCUMULO-3110 converted ConditionalWriterIT to use defaultTimeoutSeconds
ACCUMULO-3111 added some retries when checking the number of splits after merging in MetaSplitIT
Merge branch '1.6.1-SNAPSHOT'