Pkeyauth merge in OSXUniversal.

no