Fix for the logging part of this: https://review.openstack.org/#/c/487435/
This should be fixed by bug 1440576.