Merge "Replace ecomp tag with onap"