Comment 4 for bug 1595962

The functional test for this: https://review.openstack.org/#/c/338416/