Merge branch 'MAS-2018-0161-SDT_4_0_-_Support_for_excluding_certain_components_when_inheriting' into WI-0081-Smart_Device_Template_4_0