json doesn't do any magic with byte strings in python 3.  In python 2 it
used to convert str objects to unicode automatically.

More python 3 fixes in the safe_sessions middleware.

Mergeback PR from private to public.

Mergeback PR from private to public.

social link validation

Newrelic released a patch, removing constraint.

Removed google api key from github

PROD-533

Our internal docs suggest using manage_user instead of create_user. We
are no longer using it and it can be removed

LEARNER-3934

JIRA:EDUCATOR-4537

reload is not a system built-in in python 3.

Be able to override this setting from yaml.

If we're in python 3 import reload from importlib.

add endpoint that takes a user id to allow us to correctly get the di…

Reverting to last stable version of edx-enterprise

* Update Financial Assistance logic

Use the zendesk proxy app instead of the unsupported zendesk library.

* Move to pre-fetching the group IDs.

Rather than making extra requests to zendesk to list all groups and find
a specific group ID. Just make a pre-filled list of group IDs for the
groups we care about.  When a group name is passed in, it is checked
against this list and the ticket is created in the correct group so the
right people can respond to it.

* Remove old  performance tests that we haven't been running.

As far as I can tell, these tests to capture HAR files were created 5
years ago and not being run as a part of our suite?  They capture HAR
data that we do nothing with so even if they were running we should
remove them until we're ready to care about consuming this kind of
information.

* Update password test unicode string.
* Add ugettext translation helper function.
* Fix lambda syntax that is not valid in python 3.
* Fix ur raw strings which his not valid in python 3
* Use edx_six.get_gettext instead of ugettext.
* Fix a few other encoding issues.
* Don't use old form of sorted funciton.

This form which uses a 'cmp' method is not available in python 3.

Remove microsite djangoapp and configuration.

add endpoint that takes a user id to allow us to correctly get the discount after checkout to correctly create order

Upgrade edx-when to fix CR-1089

Mergeback PR from private to public.

Make CustomTagModule safe (remove Mako) [SEC-609]