Merge branch 'branch-5.6'

diff --cc sonar-application/src/main/java/org/sonar/application/App.java
Simple merge

diff --cc sonar-application/src/test/java/org/sonar/application/AppTest.java
Simple merge