ACCUMULO-3048 More CHANGES since 1.5.2rc0
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT

Conflicts:
	CHANGES
Merge branch '1.6.1-SNAPSHOT'
ACCUMULO-3115 add a better error message for the timing test
ACCUMULO-3117 found some other replication tests failing with the 50M mutation queue
ACCUMULO-3125 rename test written for specific tickets
ACCUMULO-3125 oops, didn't check in the changed files
ACCUMULO-3117 Some extra logging I added when trying to figure out what was happening WRT replication.
ACCUMULO-3128 Reduce zookeeper log spam

Also reduce SslConnectionParams because that was just as spammy
Merge branch '1.6.1-SNAPSHOT'

Conflicts:
	test/src/test/resources/log4j.properties
ACCUMULO-3128 Screwed up the conditional
Merge branch '1.6.1-SNAPSHOT'
ACCUMULO-3129 Pass credential provider into client configuration and set non-empty truststore password.

Making a non-empty password for the truststore makes things a bit
more reliable to actually work (I think empty passwords are disallowed
by the CredentialProvider impls). If the client is also using a
CredentialProvider, the ClientConfiguration also needs this property.
Adding the extra value to the enum passes it from accumulo-site.xml
into the generate client.conf by AbstractMacIT.
Merge branch '1.6.1-SNAPSHOT'
ACCUMULO-3038 unit test for deserialization problem going from 1.6.0 to 1.6.1-SNAPSHOT
ACCUMULO-3130 Ensure MultiInstanceReplicationIT is running with SSL and credential providers
ACCUMULO-3130 Try to make the test end faster.
ACCUMULO-3131 Make sure CyclicReplicationIT sets up SSL when requested
ACCUMULO-3130 Fix UnorderedWorkAssignerReplicationIT for SSL
ACCUMULO-3130 Remove config changes from debugging.