A full reconcile with the Muppets.  With the understanding this may break things

But this commonly used hopefully known working blobs.  We will revert and reapply Vanir specific fixes as needed

Change-Id: I6f5d96c0f0b07098a2c8e5b460a2198174e77bbe