[GEOS-5653] Error setting JAVA_OPTS in startup.sh
Merge branch 'master' of git://github.com/geoserver/geoserver