Merge change 4961 into donut

* changes:
  Set organizations to be null for generateKeyPair to use the default.