Merge proposals dependent on lp:~ed-leafe/nova/xs-password-reset

lp:~ed-leafe/nova/xs-password-reset has no merge proposals.