am 57b8b975: am 3888a333: am c6ab9979: Merge "Make sure the client certificate is always installed" into jb-ub-mail-ur10

* commit '57b8b975538b6ac6bb3b914813835d653a9a4978':
  Make sure the client certificate is always installed