Fixes to cookbooks for CDH versions v4, v5 support