Merge "Fix run-all-tests script when --always-clean is used"