Merge "Improved Jenkins SMTP settings"