Merge change 6767 into donut

* changes:
  Modify runtest test_defs to adjust for rename of cts-installtests.