Fixed problem with Mac platform and JVM options preventing use of the .app launcher

Change-Id: I27f6683ab15450d98138a74207a47761626264c2