[COOK-2335] Refactor to fix breakage due to Chef 11

Also:
* Fix the cherry_pick test
* Add berkshelf support
* Tidy up the vagrantfile