What problem does this code solve?
Sonarqube refactorings

Does the code still compile with Java6?
Yes

Risks
Low

Changes to the API?
No. Some constructors were deprecated.

Will this require a new release?
No

Should the documentation be updated?
No

Does it break the unit tests?
No

Was any code refactored in this commit?
Yes, this was all refactoring

Review status
APPROVED

Starting 3-day comment window