ASM-2017 ESX host comes up with DHCP address due to facts clobbering

For review: Needs more thorough testing...