UNITSOFMEASUREMENT-13: Do we need AbstractMeasurement in RI? 
Partial rollback fixing compile-problems caused by some of the merge
Task-Url: https://java.net/jira/browse/UNITSOFMEASUREMENT-13