Merge catalog\model\checkout with 1.5.5.1