Merge "Refactor PolicyNotificationMail for sonar issues"