Merge "parserTests.php: fix three bitrot bugs with --record"