Stable/havana

Merging in upstream stable/havana so that running devstack with latest upstream versions of other components works smoothly.