ACE-475 ACE-479 Fixed the problem with the discovery code not picking up settings from the launcher.

git-svn-id: https://svn.apache.org/repos/asf/ace/trunk@1629681 13f79535-47bb-0310-9956-ffa450edef68