Update to OT, CM and the CM update script.
Accomodate the change from anaran.
Reinstate root's metadata.