SVN r32817
Correct the classpath to correctly include the local directory so Java programs find the application class

SVN r32823
Cover the remaining code paths for Java apps to define class path