Merge pull request #10746 from xedin/rdar-31849281-4.0

[4.0] [QoI] Improve the fix-it for out-of-order arguments