Merge "Fix --jvm on run-tests 960 and 961"
am: aac223f83b

* commit 'aac223f83b50140823268db33e6e7e1bd17c1bed':
  Fix --jvm on run-tests 960 and 961