Merge "Change openo and ecomp to ONAP"