Merge "ONAP normative fixes"