
Merge commit from[1][2] [1]https://review.openstack.org/#/c/536657/ [2]https://review.openstack.org/#/c/536657/ Change-Id: I79bd4ca2457222abcc6a58cd3b44be21a11b5a87
Merge commit from[1][2] [1]https://review.openstack.org/#/c/536657/ [2]https://review.openstack.org/#/c/536657/ Change-Id: I79bd4ca2457222abcc6a58cd3b44be21a11b5a87