Merge "Better timeout exception in wait_for_resource_deletion"