Embedded unpacked upnpc.exe
Merge branch 'master' into 1974
getlantern/lantern#1974 Tweaked unit test so it works on all of our platforms