Merge "[SDNGC-5859] copy local change to onap"