Merge "Build /vendor/bin/logwrapper too." into pi-dev