Merge "Make add_router_to_l3_agent use **kwargs"