Change "-i" sed's argument behaviour, which now works on both mac and windows.
Merge branch 'CB-6899'
Merge branch 'CB-6869'
Merge branch 'CB-6846'