Merge branch 'hotfix/sonarUpdate' into develop

* hotfix/sonarUpdate:
  updates sonar plugin to 3.6