Merge "Add --trace variants of the run-test testing rules."