Merge branch '28.541_Rel16_CR0521_Deprecate_Top-Attr_and_use_Top_instead' into...

Merge branch '28.541_Rel16_CR0521_Deprecate_Top-Attr_and_use_Top_instead' into 'Integration_Rel16_SA5_138_YAML'

28.541 rel16 CR0521 deprecate top attr and use top instead

See merge request !178