clean up blockers from sonar
fix more sonar critical and blocker issues
Fixing compile issues in csv-requisitions
more sonar criticals
fix NPE
[bamboo] Automated branch merge (from features/sonar-cleanup:2cdd1a58580b5aa14287d38cadeb1812024e40eb)
Reverted JUnit back to 4.10 because 4.11 had strange test-reordering issues.
Lint cleanup (array style, unnecessary locals, and string concatenation).
Merge branch 'master' into soleger-master