Fix OAuth2 pk12 key download prompt.
Merge branch 'oauth-key' into 4_5_x_working