standalone.sh duplicates some options in JAVA_OPTS

Description of problem:
standalone.sh duplicates some options in JAVA_OPTS.

Steps to Reproduce:

1. ./standalone.sh

Actual results:
...
JAVA_OPTS: -server -XX:+UseCompressedOops -server -XX:+UseCompressedOops -Xms64m ...
...

Expected results:
...
JAVA_OPTS: -server -XX:+UseCompressedOops -Xms64m ...
...

Additional info:
Option "-server" is set here:

if [ "$PRESERVE_JAVA_OPTS" != "true" ]; then
   PREPEND_JAVA_OPTS="$PREPEND_JAVA_OPTS -server"
   ...
   JAVA_OPTS="$PREPEND_JAVA_OPTS $JAVA_OPTS"
fi

This part of code is in standalone.sh twice.

Possible solutions:

• Remove first repetition of if [ "$PRESERVE_JAVA_OPTS" != "true" ]; then ....... fi (like EAP 6)
• Add PREPEND_JAVA_OPTS="" after JAVA_OPTS="$PREPEND_JAVA_OPTS $JAVA_OPTS" in first repetition of if [ "$PRESERVE_JAVA_OPTS" != "true" ]; then ....... fi