Sonarqube fixes

[Yogesh Mahajan]

Hello Team,

Please find the attached patch which fixes around 25 sonarqube issues.

Thanks,
Yogesh Mahajan
EnterpriseDB

Sonarqube_fixes_v1.patch
Description: Binary data