Merge proposals dependent on lp://qastaging/~hopem/charms/trusty/keystone/fix-pki-token-support.2

lp://qastaging/~hopem/charms/trusty/keystone/fix-pki-token-support.2 has no merge proposals.