Merge branch 'revert-b77a0b2b' into 'Integration_Rel18_SA5_151_YAML'

Revert "Merge branch 'TS28.312_Rel-18_CR0137_Update_5GC_expectation' into...

See merge request !820