Merge branch 'branch-5.6'

author Sébastien Lesaint <sebastien.lesaint@sonarsource.com>

Tue, 23 Aug 2016 11:59:58 +0000 (13:59 +0200)

committer Sébastien Lesaint <sebastien.lesaint@sonarsource.com>

Tue, 23 Aug 2016 11:59:58 +0000 (13:59 +0200)
author Sébastien Lesaint <sebastien.lesaint@sonarsource.com>
Tue, 23 Aug 2016 11:59:58 +0000 (13:59 +0200)
committer Sébastien Lesaint <sebastien.lesaint@sonarsource.com>
Tue, 23 Aug 2016 11:59:58 +0000 (13:59 +0200)
diff --cc sonar-db/src/main/java/org/sonar/db/version/v50/FeedFileSources.java
Simple merge
author	Sébastien Lesaint <sebastien.lesaint@sonarsource.com>
	Tue, 23 Aug 2016 11:59:58 +0000 (13:59 +0200)
committer	Sébastien Lesaint <sebastien.lesaint@sonarsource.com>
	Tue, 23 Aug 2016 11:59:58 +0000 (13:59 +0200)