Merged from contrail-chef repo for 2.0.19
New templates from contrail-chef repo for 2.0.19