New cli-based UPnP implementation #1678
Changes to simplify finding the correct path to the UPnP executable across operating systems and installed versus uninstalled versions #1678
Improved threading for UPnP mappings, comments, etc #1678
Merging in changes for #1678