Merge "Allows DPM.generateKeyPair() to be called from PO of affiliated user." into sc-v2-dev