Revert "Switch to havana branch of puppet-COI"

This reverts commit 98b24392b4fcf57ae0457bf5c8f58a7beca7b5b1.
b126d7340586f6db28f9008f297a88757a4968f3 commit from upstream
should remove the need for this overriding of versions.