Removed sleeps

Switched over to log watching.
Initial work for CASSANDRA-6177