Merge ECOMP updates to v25 schema