Merge "Add email settings for services-ci"