Sync code with oslo-incubator

Change-Id: I06d42e9841c6cc7eab13bb7cafca3de605f350ad
Fix typo

Change-Id: I5914fdb161a72745192e172d63aeae9110a48528