[CDO] Add CDO'ified models

Align the CDO'ified version of Architecture.genmodel with new version of
the original Architecture.genmodel (related to Bug 565361)

Change-Id: I24bfe53d495238540b3e5fb9f46041f483b581a5
18 files changed