HOTFIX: Google Checkout Corrections

Corrected two issues in Google Checkout:
* Extended shipping will be added to a Google Checkout order at a better time in the order process
* Fixed a null ref issue for items added via discount