* Fix naming discrepancies between repos.conf & .gitmodules

The .gitmodules was unintentionally set up with different names as this
is the default for "git submodule add". Rename submodulse to use the
names chosen in repos.conf.

* Merge repos.conf with .gitmodules

These duplicate the same information. Merge them.

* Add commits to .gitmodules

This avoids having a dirty tree after running

	make -f Makefile-bootstrap repos

which was happening because repos.conf doesn't track versions.

* Add a transition script to rename submodules.

After fixing .gitmodules to use the same names as repos.conf, we need a
way to transition checkouts to the new names.

Add a sript to do this and run it from bootstrap.

* Restyle