Merge "Fix --jvm on run-tests 960 and 961"