Closes-Bug: #1404350
Changes done to make current contrail puppet manifests work with puppet 3.7.

Change-Id: I490d10a6897d407a37148f6080a8904708478f9e