merging in fix from oslo upstream

Change-Id: I61ae24b305df086a5c48a6d033046d84296023b2
Merge "merging in fix from oslo upstream"