initial merge from contrail-chef repo