SONAR-5758 fix quality flaws
Automatic merge from branch-4.5

* origin/branch-4.5:
  SONAR-5758 fix quality flaws