The upgrade function errors out a lot due to a timeout.  The timeout was
happening during the _get_package_items function due to the object mask.
I tweaked the mask and now the getItems call takes a few seconds rather
than a few minutes.  The response structure is slightly different, so I
had to modify _get_item_id_for_upgrade to account for that.
Modified the vs_tests and Product_Package to match the new result set
returned by getItems.  Categories are now under 'prices'.  Before they
were under 'item'.
Revert "Modified the vs_tests and Product_Package to match the new result set returned by getItems.  Categories are now under 'prices'.  Before they were under 'item'."

This reverts commit 43a0ff999d42a2c44e86a7bca7d1f49e9acebec9.
Modified vs_tests and Product_Package to use the new result set returned
by getItems.  Categories are now under 'prices'.  Before they were under
'item'.
Changed tests to match _get_package_items
Modified vs_tests and Product_Package to use the new result set returned
by getItems.  Categories are now under 'prices'.  Before they were under
'item'.
Changed tests to match _get_package_items
Changed tests to match _get_package_items
Changed tests to match _get_package_items
Revert "Changed tests to match _get_package_items Modified vs_tests and Product_Package to use the new result set returned by getItems.  Categories are now under 'prices'.  Before they were under 'item'."

This reverts commit 302d2e7725bd4e16724e7fec05805815a41a9f6e.
Changed tests to match _get_package_items
Changed tests to match _get_package_items
Changed tests to match _get_package_items
Merge pull request #368 from chumbley/master

Fix for upgrade timeout