Merge "Make rest_client.wait_for_resource_deletion timeout error more specific"