Merge pull request #1031 from feckert/add_dhcp_to_system_ucitrack