Changes for amazon SES
merged settings for amazon SES from master