Merge "Revert "Temporarily trim leading/trailing whitespace from parser test clauses""