Merge branch...

Merge branch '28.104_Rel20_SA5#167_add_new_feature_regarding_consumer_indication_of_preference_requirements' into 'Integration_Rel20_SA5_167_YAML'

Rel-20 CR TS28104_MdaNrm add preference requirements

See merge request !2117