update for icehouse-3 fixes
Updates for icehouse-3 and other stuff
Update to expose Dnsmasq options