Merge "ONAP Service Mesh compliant modification"