Merge branch 'master' of github.com:red6/sonar into red6-master

diff --cc sonar-application/src/main/assembly/conf/sonar.properties
Simple merge

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

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