Manage FQDN in networkdiscovery. closes #1922