SERVER-13573 Fix x.509 auth exception

(cherry picked from commit c151e0660b9736fe66b224f1129a16871165251b)
Merge remote-tracking branch 'upstream/v2.6' into v2.6