Update sonar config
Merge branch 'master' into develop
Change options