Don't shut MessagingService down.

Patch by brandonwilliams, reviewed by Benedict for CASSANDRA-6948
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk