Sync with oslo-incubator.

Up to date as of 575e74d352d685773513218a286979bb58920246.

Change-Id: I302bd832fdd4ee6a325b600aceba525b109bb4e1
Merge "Sync with oslo-incubator."