[3.0] Backport upnp contrib update

Theses patches update and modernize the upnp stack for 3.0.x fixing fixing vulnerabilities and simplifying the code.