Merge "Increase zookeeper.connection.timeout.ms up to 12 sec"