Front-ported changes from 6.1.x branch.
Merge branch 'master' into LRDOCS-339
removed sentence about JAVA_OPTS environment variable since it's just a convention to use JAVA_OPTS on some, not all, app servers