Automatic merge from branch-6.7

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

Fri, 3 Nov 2017 14:08:47 +0000 (15:08 +0100)

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

Fri, 3 Nov 2017 14:08:47 +0000 (15:08 +0100)
author ssjenka <ssjenka@ops-slave-fedora25-1.internal.sonarsource.com>
Fri, 3 Nov 2017 14:08:47 +0000 (15:08 +0100)
committer ssjenka <ssjenka@ops-slave-fedora25-1.internal.sonarsource.com>
Fri, 3 Nov 2017 14:08:47 +0000 (15:08 +0100)
diff --cc sonar-core/src/main/resources/org/sonar/l10n/core.properties
Simple merge
author	ssjenka <ssjenka@ops-slave-fedora25-1.internal.sonarsource.com>
	Fri, 3 Nov 2017 14:08:47 +0000 (15:08 +0100)
committer	ssjenka <ssjenka@ops-slave-fedora25-1.internal.sonarsource.com>
	Fri, 3 Nov 2017 14:08:47 +0000 (15:08 +0100)