Pkeyauth merge in OSXUniversal.

done