Merge remote-tracking branch 'remotes/origin/branch-4.5'

Conflicts:
	sonar-application/src/main/java/org/sonar/application/DefaultSettings.java

diff --cc sonar-application/src/main/java/org/sonar/application/DefaultSettings.java
index 3a710e779c552e4fb6269bcba688c0bf19b8a9a8,c905827db522ee7a72031e6e95a60286c8acd61c..cfb395a8f8b43daa9c5f92cdb61c286ff170cfd7
--- 1/sonar-application/src/main/java/org/sonar/application/DefaultSettings.java
--- 2/sonar-application/src/main/java/org/sonar/application/DefaultSettings.java
+++ b/sonar-application/src/main/java/org/sonar/application/DefaultSettings.java
@@@ -57,18 -68,17 +57,17 @@@ class DefaultSettings 
  
    private static Map<String, String> defaults() {
      Map<String, String> defaults = new HashMap<String, String>();
 -    defaults.put(CLUSTER_NAME, "sonarqube");
 -    defaults.put(SEARCH_JAVA_OPTS, "-Xmx256m -Xms256m -Xss256k -Djava.net.preferIPv4Stack=true " +
 +    defaults.put(ProcessConstants.CLUSTER_NAME, "sonarqube");
 +    defaults.put(ProcessConstants.SEARCH_JAVA_OPTS, "-Xmx256m -Xms256m -Xss256k -Djava.net.preferIPv4Stack=true " +
        "-XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:CMSInitiatingOccupancyFraction=75 -XX:+UseCMSInitiatingOccupancyOnly " +
-       "-XX:+HeapDumpOnOutOfMemoryError -Djava.awt.headless=true");
+       "-XX:+HeapDumpOnOutOfMemoryError");
 -    defaults.put(SEARCH_JAVA_ADDITIONAL_OPTS, "");
 -    defaults.put(CLUSTER_NODE_NAME, "sonar-" + System.currentTimeMillis());
 -    defaults.put(WEB_JAVA_OPTS, "-Xmx768m -XX:MaxPermSize=160m -XX:+HeapDumpOnOutOfMemoryError");
 -    defaults.put(WEB_JAVA_ADDITIONAL_OPTS, "");
 -    defaults.put(JDBC_URL, "jdbc:h2:tcp://localhost:9092/sonar");
 -    defaults.put(JDBC_LOGIN, "sonar");
 -    defaults.put(JDBC_PASSWORD, "sonar");
 +    defaults.put(ProcessConstants.SEARCH_JAVA_ADDITIONAL_OPTS, "");
 +    defaults.put(ProcessConstants.CLUSTER_NODE_NAME, "sonar-" + System.currentTimeMillis());
-     defaults.put(ProcessConstants.WEB_JAVA_OPTS, "-Xmx768m -XX:MaxPermSize=160m -XX:+HeapDumpOnOutOfMemoryError -Djava.net.preferIPv4Stack=true " +
-       "-Djava.awt.headless=true -Dfile.encoding=UTF-8 -Djruby.management.enabled=false");
++    defaults.put(ProcessConstants.WEB_JAVA_OPTS, "-Xmx768m -XX:MaxPermSize=160m -XX:+HeapDumpOnOutOfMemoryError -Djava.net.preferIPv4Stack=true");
 +    defaults.put(ProcessConstants.WEB_JAVA_ADDITIONAL_OPTS, "");
 +    defaults.put(ProcessConstants.JDBC_URL, "jdbc:h2:tcp://localhost:9092/sonar");
 +    defaults.put(ProcessConstants.JDBC_LOGIN, "sonar");
 +    defaults.put(ProcessConstants.JDBC_PASSWORD, "sonar");
      return defaults;
    }