Update cookbook

@heph @mchesnut This is just the cookbook merge from upstream. Please review. Tested in staging.