UPnP discovery fix for devices that send multiple response packets

Fix UPnP discovery and port mapping issues reported in #896