Fix schema concurrency exceptions (backport of #6841)
Merge branch 'cassandra-1.2' into cassandra-2.0
Don't NPE when username is supplied but password isn't.

Patch by Mike Adamson, reviewed by brandonwilliams for CASSANDRA-7050
Merge branch 'cassandra-2.0' into cassandra-2.1