Merge "Remove unused tenant_cidr from test_routers.py"