Merge "Revert "Clarify handling client certificates"" into mnc-dev