ssdp: If we fail to bind, retry later

Fixes #1838
ssdp: Remove unused code
Merge remote-tracking branch 'upstream/master'