Revert "Revert "Bug 905882 - Update hamachi manifest to 1.2 upstream""

This reverts commit ba06caccd9d47d76962cade5d9040f4f1fb36a95.

Let's try landing this again.