Merge proposals dependent on lp:~devstack/devstack/master

lp:~devstack/devstack/master has no merge proposals.