Update docs, bump CQL3 version, correct CHANGES.txt for CASSANDRA-6395
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	CHANGES.txt
add client encryption support to sstableloader
patch by Sam Tunnicliffe; reviewed by Mikhail Stepura for CASSANDRA-6378
Merge branch 'cassandra-2.0' into trunk
add SSLTransportFactory.java
Merge branch 'cassandra-2.0' into trunk
Merge branch 'trunk' of http://git-wip-us.apache.org/repos/asf/cassandra into trunk
remove dead code
Merge branch 'trunk' of http://git-wip-us.apache.org/repos/asf/cassandra into trunk