Improved threading for UPnP mappings, comments, etc #1678