Sonar violations - Empty If Stmts & While Stmts
Revert pom.xml changes. Only intended for Sonar users.