Merged: https://review.openstack.org/#/c/353343/ (stable/mitaka) and https://review.openstack.org/#/c/351998/ (master). Thanks, Shengjing!
Merged: https:/ /review. openstack. org/#/c/ 353343/ (stable/mitaka) and https:/ /review. openstack. org/#/c/ 351998/ (master). Thanks, Shengjing!