Merge catalog\controller\checkout\ with opencart 1.5.5.1