Resync with oslo-incubator.