Merge "Scenario/manager.py: always wait when delete a cinder vol"