Mergebot: Codebase as released with permission from CommProve?, plus cleanups to remove traces of that environment.