Merge "Adds "add_dhcp_agent" to test_dhcp_agent_scheduler"