Automatic merge from branch-5.6

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

Fri, 16 Sep 2016 15:14:15 +0000 (17:14 +0200)

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

Fri, 16 Sep 2016 15:14:15 +0000 (17:14 +0200)
author ssjenka <ssjenka@ops-slave-centos7-1.internal.sonarsource.com>
Fri, 16 Sep 2016 15:14:15 +0000 (17:14 +0200)
committer ssjenka <ssjenka@ops-slave-centos7-1.internal.sonarsource.com>
Fri, 16 Sep 2016 15:14:15 +0000 (17:14 +0200)
diff --cc server/sonar-server/src/main/java/org/sonar/server/es/BulkIndexer.java
Simple merge
author	ssjenka <ssjenka@ops-slave-centos7-1.internal.sonarsource.com>
	Fri, 16 Sep 2016 15:14:15 +0000 (17:14 +0200)
committer	ssjenka <ssjenka@ops-slave-centos7-1.internal.sonarsource.com>
	Fri, 16 Sep 2016 15:14:15 +0000 (17:14 +0200)