We should mainline CMS into the source tree as: - development on CMS seems to have stalled - mainline CMS to make it easier for developers to make changes to CMS as it is part of the source tree. - maybe use git-subtree - mainline CMS's isolate sandbox too.