fix es_app_to_dict (bug 918051)

move upsell up so we can use it