Merge "Clean up scenario floating IP waiting"