Merge pull request #1625 from diox/app-upsell-non-public

Fix upsell in AppSerializer and es_app_to_dict (bug 956820)
Replace es_app_to_dict with a Serializer (bug 945820)