Moving back the puppet manifests to package along with contrail-install-packages, as server manager expects it to be there.

Change-Id: I95f311cb64c34bcc66be7c05f69a11e18305044f
Merge "Moving back the puppet manifests to package along with contrail-install-packages, as server manager expects it to be there."