Description of problem: Track inclusion of https://review.openstack.org/#/c/561208/ in downstream build.
*** This bug has been marked as a duplicate of bug 1568367 ***