Merge changes from topic 'TrustCert' into nyc-dev

* changes:
  Show trust option for multiple unapproved cert in chain
  CertDialog supports multiple certs