Merge "Fix KeyPairGenerator test for DH"