Don't NPE when shutting down non-existent thrift server
Merge branch 'cassandra-1.2' into cassandra-2.0