Merge branch 'AIRAVATA-2509-account-confirmation-emails-not-making-it-to-users' into develop