Merge pull request #4859 from saurabh6790/cart_fixes

Shopping Cart with multi currency and checkout fixes