Merge pull request #17450 from nathawes/rdar41353459-migrator-tuple-arguments-test-failure-4.2

[4.2][migrator] Upstream overlay3/4.json and associated tests

Author: Nathan Hawes