Merged from contrail-chef repo
Merged recipes from contrail-chef repo