Add additional waits

Dependent on https://github.com/pcmanus/ccm/pull/124.

For CASSANDRA-7012.