Merge "Add a generic "wait_for_volume_resource_status" function"