Backport oc_erchef into 11

This brings the latest erchef/oc-chef-pedant into EC 11.