Ninja-unify 1.1/1.2/2.0 system tests
Move CassandraServerTest.test_get_count() to thrift server tests
Merge branch 'cassandra-1.1' into cassandra-1.2

Conflicts:
	test/unit/org/apache/cassandra/service/CassandraServerTest.java