Add additional waits in the command line

For use by the java-driver to eliminate Jenkins race conditions for CASSANDRA-7012.