Fix some sonar warnings
Merge branch 'develop' of ssh://github.com/IHTSDO/MLDS into develop