Sprint20 merge

This is the merge of the chef-cookbooks from Sprint20 to master.

please verify SHA of submodule with
git submodule