Merge "Move wait_for_resource_status()"