Chef 11 support

This will patch the stable branch with the changes from #325