Update the merge scripts for the big git rename.

Let's see what else I forgot..

2 files changed