Sync latest openstack-common updates.

Change-Id: I09adc9b5c01aa97ffba58dff8a696172e8654e3e
Merge "Sync latest openstack-common updates."