fix NPE when stopping nonexistent native server, again.
Merge branch 'cassandra-2.0' into trunk