TRUNK-4359 Units Of Measure concept class needs to be split into 2 separate concept classes