Merge "run-test: add --never-clean option"