Merge "Sonar vulnerability fixes in CronJobManager"