A fix for this was delivered today under https://review.openstack.org/#/c/578921/

Any objections to marking the story as merged ?

Brent