Partial-Bug: #1397496
Changes to refactor contrail and openstack (used from puppet labs) modules to use
roles/profiles.

Change-Id: I7cee01294d531ec98efbf98c6bb01efd8f5672a7
Merge "Partial-Bug: #1397496 Changes to refactor contrail and openstack (used from puppet labs) modules to use roles/profiles." into R2.0