Merge proposals dependent on lp://staging/~zseil/pyopenssl/privatekey-callback-fixes

lp://staging/~zseil/pyopenssl/privatekey-callback-fixes has no merge proposals.