Merge "[Scenario] New test to check extra_dhcp_opts"