Fix client message translation function and add tests
Merge pull request #2660 from ironcladlou/dev/v2carts/cucumber

Merged by openshift-bot