Merge branch 'TR28.623_R18_CR0487_Corrections_of_measurement_type' into...

Merge branch 'TR28.623_R18_CR0487_Corrections_of_measurement_type' into 'Integration_Rel18_SA5_159_YANG'

Tr28.623 r18 cr0460 corrections of measurement type

See merge request !1550