Rebase the preparation patch

 * And add the tests patch for good measure.
Temporarily disable shipping certs
Fix libotr build for Windows