20581 capx impl 3

More Capella updates. Capx importer now feature complete compared to cap importer. Fixed triplets (both cap and capx).