Merge proposals dependent on lp://qastaging/~nick-moffitt/charms/trusty/keystone/add-admin-relation

lp://qastaging/~nick-moffitt/charms/trusty/keystone/add-admin-relation has no merge proposals.