Problem: we use 'sleep 2; wait_for_slave_to_stop;' to reach some slave's states which is buggy, wasteful of time, platform dependant etc. Fix: use include/wait_for_slave_***.inc's where it's possible instead.
