Merge "Prevent raising exception if IP address is set in _hotplug_server"