Fixed various sonar issues
Merge branch 'develop' of ssh://github.com/NLeSC/octopus into develop