Sync with oslo stable/grizzly c7862b5239822d701b7fb155faa4607eff602627

Change-Id: Ib7f5dd1404bdac1969e947cc310573052760f3f4