Merge branch 'RDM-2019-0010-SDT_4_0_–_Align_types_of_names_and_identifiers'...

Merge branch 'RDM-2019-0010-SDT_4_0_–_Align_types_of_names_and_identifiers' into WI-0081-Smart_Device_Template_4_0

# Conflicts:
#	SDT/schema4.0/docs/SDT_UML.uxf
#	SDT/schema4.0/docs/images/SDT_UML_Basic_Elements.png