Merge "Fix no attribute 'is_dvr_router' error in test_l3_agent_scheduler"