Changes to simplify finding the correct path to the UPnP executable across operating systems and installed versus uninstalled versions #1678