Merge pull request #18106 from edx/efischer/is_it_this_easy

cms/djangoapps/contentstore/api/views.py

cms/djangoapps/contentstore/views/public.py

cms/templates/base.html

cms/templates/widgets/header.html

cms/templates/widgets/segment-io-footer.html

common/djangoapps/django_comment_common/models.py

common/djangoapps/enrollment/views.py

common/djangoapps/student/auth.py

common/djangoapps/student/roles.py

common/djangoapps/student/tests/test_authz.py

common/djangoapps/student/views/login.py

common/djangoapps/student/views/management.py

common/djangoapps/third_party_auth/pipeline.py

common/djangoapps/util/cache.py

common/djangoapps/util/milestones_helpers.py

common/djangoapps/util/views.py

common/djangoapps/xblock_django/user_service.py

.../test_sites/test_site/templates/static_templates/faq.html

lms/djangoapps/branding/views.py

lms/djangoapps/certificates/views/xqueue.py