Fix discovery for sonos and, save data to collection
Fixed, remove old updgrade data
Device Discovery give ipaddress back where modelname is like
Update tools for device discover