OpenStack cleanup for tim-stable

A pair of patches getting OpenStack working end-to-end, on the tim-stable branch.