Bug 563666 - Fix Sonar issues to improve code quality
6 files changed