Fix help modal css selector
Revert "If feature flag is enabled, replace the old login/registration pages with the new combined login/registration page."

This reverts commit f40447b3c8f3946c2edbd21c92fe743e9f54a39d.

Conflicts:
	lms/urls.py

Revert "Add support for external auth on the combined login/registration page"

This reverts commit 988753395fa7509472b99b420057e151ce213399.

Conflicts:
	lms/templates/courseware/mktg_course_about.html
	lms/urls.py
Merge pull request #6156 from edx/will/revert-logistration-enablement

Revert enable login/registration
Create helper function to remove duplicate code

This repetitive code is especially pronounced in Stanford's fork, where
we have extended the About page to include several additional fields.

This pays down some technical debt by refactoring into a shared helper.
Merge pull request #5966 from Stanford-Online/kluo/help-modal-id

Fix help modal css selector
Merge pull request #5874 from stvstnfrd/up/course/about

Create helper function to remove duplicate code
Implement user service to return currently-logged-in user

returns XBlockuser with 2 data layers
fix unrelated test that was failing