Merge "Add a couple scripts to fixup version scripts."