SSL does not work in cassandra-cli.

patch by jasobrown, reviewed by beobal for CASSANDRA-7899
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/thrift/SSLTransportFactory.java