[WIP] Use oc-chef-pedant branch hh/fix-deprecations