Merge proposals dependent on lp://qastaging/~james-page/charms/precise/keystone/ensure_user_fix

lp://qastaging/~james-page/charms/precise/keystone/ensure_user_fix has no merge proposals.