(cherry picked from commit fdebe419)

Conflicts:
	jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx

Change-Id: I4c26c704ce85a273d7022260bb721e295041c260