Roshanp email sls

Merged Roshan Patil requested to merge Roshanp-EmailSLS into devbranch