Comment 6 for bug 834633

The review listed above won't be merged into diablo (it has loads of essex changes mixed in), and the launchpad branch is only half the fix..

I've just submitted the the minimal changes needed to fix this for review https://review.openstack.org/1328

Hopefully this will get approved and merged in...