Sync with oslo-incubator stable/grizzly

SHA1: c7862b5239822d701b7fb155faa4607eff602627

Change-Id: I98364124433165d6bd1de42dd4566286de7e0e4a