SDPII-30 Same flag for both Email & SMS
SDPII-30 Cucumber Spec Fix
Merge branch 'master' of github.com:StrataLabs/service_desk