[BZ 1069648] Persist JAVA_OPTS from connection settings for Standalone se...

...rvers.
Initially I wanted to change the upgrade code too but no need for that. Removed.