[Backport] ISSUE-5021 fixed guest checkout with custom shipping carrier with underscores#21340

magento-engcom-team merged 2 commits intomagento:2.2-developmagento/magento2:2.2-developfrom

hostep:backport-pr-19505hostep/magento2:backport-pr-19505Copy head branch name to clipboard