Merge catalog\controller\payment with opencart 1.5.5.1