Fix edX name hardcoded in password reset email

Updating commits from #5863 with a bunch of needed fixes, added tests, and squashed commits.

[OSPR-187](https://openedx.atlassian.net/browse/OSPR-187)
OK, great. I'll add that in.