Fix SonarQube issues.
Reformatting/Corrected Sonar errors
Merge branch 'master' of https://github.com/jhipster/generator-jhipster