I uploaded a try to fix #1813198 here: https://review.openstack.org/633502 We'll see some test results soon if it works or not. Cheers, Bence