Sync with oslo a8973c52

Change-Id: Iacf59007d63a24df3973353d275b4113334e2d46