Merge proposals dependent on lp://qastaging/~james-page/cinder/havana-rc2

lp://qastaging/~james-page/cinder/havana-rc2 has no merge proposals.