Merge change I200886b4

* changes:
  Make cacerts.bks available to the simulator too.