Merge branch 'dev' into bug/rate-limit

Author: Sachin Maheshwari

connect/constants.js

@@ -10,7 +10,6 @@ module.exports = {
 
   // email service id for settings
   SETTINGS_EMAIL_SERVICE_ID: 'email',
-  SETTINGS_EMAIL_BUNDLING_SERVICE_ID: 'emailBundling',
   ACTIVE_USER_STATUSES: ['ACTIVE'],
 
   BUS_API_EVENT: {