fixing specs
Merge branch 'master' of https://github.com/StrataLabs/service_desk
changes in uat_mail_interceptor
Merge branch 'master' of https://github.com/StrataLabs/service_desk
Merge branch 'master' into rule_validations