Synchronized Openstack Common

Change-Id: Id4aedc35c6cd7597fa223360e1f64ecea0ad6517
Merge "Synchronized Openstack Common"