UNITSOFMEASUREMENT-82: EDR 
Updated launcher
Task-Url: https://java.net/jira/browse/UNITSOFMEASUREMENT-82