Various UPnP updates

The referenced change sets are a variety of minor tweaks and updates to the UPnP API, as well as a fix for the log spam reported in #896