Improve windows stop functionality. Fixes #167.

CASSANDRA-7901 causes us to need specific 2.1.0 functionality.
Remove extra wait call.