Merge change Id752d5fb

* changes:
  Including cert store location for test runner.