Revert "Merge v2.2.0 from upstream"

Fails because other cookbooks depend on yum < 3.0.0

This reverts commit 649f9de7a61a1102388d484865238ee97727a45d.