Fix problem with NETBIOSNAME and SNMPHOSTNAME when discovery. closes #1925