Comment 3 for bug 1532048

Here is the g-r sync to horizon stable/kilo: https://review.openstack.org/#/c/265179/

I had to update that to workaround a pbr bug so we can get this merged and unblock kilo and liberty.