Automatic merge from branch-5.6

author ssjenka <ssjenka@ops-slave-centos7-1.internal.sonarsource.com>

Mon, 13 Jun 2016 07:45:53 +0000 (09:45 +0200)

committer ssjenka <ssjenka@ops-slave-centos7-1.internal.sonarsource.com>

Mon, 13 Jun 2016 07:45:53 +0000 (09:45 +0200)
author ssjenka <ssjenka@ops-slave-centos7-1.internal.sonarsource.com>
Mon, 13 Jun 2016 07:45:53 +0000 (09:45 +0200)
committer ssjenka <ssjenka@ops-slave-centos7-1.internal.sonarsource.com>
Mon, 13 Jun 2016 07:45:53 +0000 (09:45 +0200)
diff --cc sonar-application/src/main/assembly/conf/sonar.properties
Simple merge
author	ssjenka <ssjenka@ops-slave-centos7-1.internal.sonarsource.com>
	Mon, 13 Jun 2016 07:45:53 +0000 (09:45 +0200)
committer	ssjenka <ssjenka@ops-slave-centos7-1.internal.sonarsource.com>
	Mon, 13 Jun 2016 07:45:53 +0000 (09:45 +0200)