Merge "Skip test_router_rescheduling if l3 scheduler extension is not enabled"