Merge "Deleting ports before deletion of routers in resource_cleanup"