Merge "Sonar critical fixes in EPAppCommonServiceImpl"