Merge branch...

Merge branch '28.623_Rel16_CR0131_Replace_local_data_type_definition_for_notificationFilter_by_common_filter_definition' into 'Integration_Rel16_SA5_138_YAML'

28.623_Rel16_CR0131 Update genericNrm.yaml

See merge request !186