[CGIV-112] - Tidy cookbooks and berkshelf file

updated from "unreleased version"