Merge "Skip test_update_router_admin_state for baremetal"