Merge "Clarify handling client certificates" into mnc-dev