Merge branch 'MAS-2018-0135-SDT_4_0_-_Introducing_void_data_type_to_BasicType' into WI-0081-Smart_Device_Template_4_0
