Changes to fix certification SMS tests
Solve conflicts with merge from integration-v2.1
Merge pull request #557 from owdqa/bug/fix_sms_v2.1

Bug/fix sms v2.1