Merge "Make add_dhcp_agent_to_network  use **kwargs"