Automatic merge from branch-5.6

* origin/branch-5.6:
  Fix documentation of properties *.javaOpts

sonar-application/src/main/assembly/conf/sonar.properties

@@ -80,13 +80,13 @@
 
 #--------------------------------------------------------------------------------------------------
 # WEB SERVER
-
-# Web server is executed in a dedicated Java process. By default heap size is 768Mb.
+# Web server is executed in a dedicated Java process. By default heap size is 512Mb.
 # Use the following property to customize JVM options.
 #    Recommendations:
 #
 #    The HotSpot Server VM is recommended. The property -server should be added if server mode
-#    is not enabled by default on your environment: http://docs.oracle.com/javase/7/docs/technotes/guides/vm/server-class.html
+#    is not enabled by default on your environment:
+#    http://docs.oracle.com/javase/8/docs/technotes/guides/vm/server-class.html
 #
 #sonar.web.javaOpts=-Xmx512m -Xms128m -XX:+HeapDumpOnOutOfMemoryError
 
@@ -126,12 +126,13 @@
 #--------------------------------------------------------------------------------------------------
 # COMPUTE ENGINE
 # The Compute Engine is responsible for processing background tasks.
-# Compute Engine is executed in a dedicated Java process. By default heap size is 512Mb.
+# Compute Engine is executed in a dedicated Java process. Default heap size is 512Mb.
 # Use the following property to customize JVM options.
 #    Recommendations:
 #
 #    The HotSpot Server VM is recommended. The property -server should be added if server mode
-#    is not enabled by default on your environment: http://docs.oracle.com/javase/7/docs/technotes/guides/vm/server-class.html
+#    is not enabled by default on your environment:
+#    http://docs.oracle.com/javase/8/docs/technotes/guides/vm/server-class.html
 #
 #sonar.ce.javaOpts=-Xmx512m -Xms128m -XX:+HeapDumpOnOutOfMemoryError
 
@@ -150,13 +151,14 @@
 #--------------------------------------------------------------------------------------------------
 # ELASTICSEARCH
 # Elasticsearch is used to facilitate fast and accurate information retrieval.
-# It is executed in a dedicated Java process.
+# It is executed in a dedicated Java process. Default heap size is 1Gb.
 
 # JVM options of Elasticsearch process
 #    Recommendations:
 #
 #    Use HotSpot Server VM. The property -server should be added if server mode
-#    is not enabled by default on your environment: http://docs.oracle.com/javase/7/docs/technotes/guides/vm/server-class.html
+#    is not enabled by default on your environment:
+#    http://docs.oracle.com/javase/8/docs/technotes/guides/vm/server-class.html
 #
 #sonar.search.javaOpts=-Xmx1G -Xms256m -Xss256k -Djna.nosys=true \
 #  -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75 \