Bug 563666 - Fix Sonar issues to improve code quality for partitioning
27 files changed