Merge "Wait properly for server deletion in test_volumes_actions"