Closes-Bug: #1376059
Merge R1.10 contrail-puppet changes to mainline.
Change-Id: I9d341a2869a640e13bc6c80246088d3414188dbc