UNITSOFMEASUREMENT-10: Java 8 issues 

Task-Url: https://java.net/jira/browse/UNITSOFMEASUREMENT-10