Merge change 26315 into eclair

* changes:
  VpnService: use Credentials instead of CertTool.