Merge changes I4ca880f6,I6ebe18fe

* changes:
  Fix test failures with -Xjitthreshold:0.
  Pass --runtime-option from testrunner to run-test.