Sync openstack common with oslo stable/havana

Change-Id: Ib959a963c85eb8949a6e13ee2a49ee739df44b86
Merge "Sync openstack common with oslo stable/havana"