Fix edX name hardcoded in password reset email

Updating commits from #5863 with a bunch of needed fixes, added tests, and squashed commits.
Good catch. No idea. Will fix.