Bringing in no_contrail_openstack on compute node changes from R1.06, customers may install their own nova-compute in compute node.

Change-Id: If144fc17249b190623d5459be7b58af30c2edcca
Merge "Bringing in no_contrail_openstack on compute node changes from R1.06, customers may install their own nova-compute in compute node." into R1.10