Merge "Revert^2 "Ensure that run-test preserves exit status""