Sync with oslo a8973c52

Change-Id: I2ba927e068c71dd8a91674e36f2bf26650d1c58e