Merge "DPM: installKeyPair variant: caller can self-grant" into nyc-dev