ACCUMULO-3059 Allow configuration of truststore password and root keystore password
ACCUMULO-3045 Fix some misleading logging messages
Merge branch '1.6.1-SNAPSHOT'