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

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