DATAJPA-624 - Fix SonarQube warnings as far as possible/reasonable.