Merge "Sync up the changes between ecomp and onap"