[Bug 1049973] File conflicts TW upgrade ruby2.2 to ruby2.4