Merge "Move wait_for_qos_operations into base volume test"