Merge proposals dependent on lp:~james-page/cinder/fixup-getent

lp:~james-page/cinder/fixup-getent has no merge proposals.