Merge branch...

Merge branch 'TS28.538_Rel-18_CR_28.538_Update_the_type_and_allowed_value_of_attributes' into 'Integration_Rel18_SA5_157_YAML'

TS28.538_Rel-18_CR0091_28.538_Update_the_type_and_allowed_value_of_attributes

See merge request !1361