Changes for bumping UPnP to latest version