OpenStack fixes for tim-stable

Sending the right branch this time...