Make versioned_cookbooks work as expected
Get tests working against Chef 11 again