Fixes for SMS suite
Solve conflicts regenerating language files
Merge pull request #441 from owdqa/bug/fix_sms_v20

Fixes for SMS suite