am 6742a0c9: am 779a4ca8: Merge "Improve robustness of package manager certificate collection." into froyo

Merge commit '6742a0c9ccb8ade97d9cdfd53f7c74a9dc04c3a0' into kraken

* commit '6742a0c9ccb8ade97d9cdfd53f7c74a9dc04c3a0':
  Improve robustness of package manager certificate collection.