Remove extra line
Fix pep8 violations in some tests
Show student verification status on the dashboard.
ECOM-677 ECOM-678 styled the new messages
Merge pull request #6113 from Shrhawk/shr/bug/TNL-590-encode-error-fixing-pep-8

Remove extra line
Merge pull request #6112 from edx/zoldak/fix-pep8

Fix pep8 violations in some tests
Added OAuth2 Permissions Scope Handler

This scope offers a simple claim, administrator, that is true iff the user is a superuser.
Merge pull request #6105 from edx/clintonb/oidc-administrator-claim

Added OAuth2 Permissions Scope Handler
Added styles for email opt in/out checkbox label
Merge pull request #6115 from edx/alasdair/email-opt-out

Added styles for email opt in/out checkbox label
Revert "Do not install requirements from github.txt in editable mode"

This reverts commit 61cf1d6edb4609094ba6b84c87a29ff5bec4ee2c.

Conflicts:
	requirements/edx/github.txt
Merge pull request #6070 from edx/will/verified-messaging-per-course

Student verification status
Merge pull request #6121 from edx/clytwynec/revert-not-editable-mode

Revert "Do not install requirements from github.txt in editable mode"
Fix dashboard i18n
Keep closing lines of email together for translation purposes
Add additional context for translators
Add management command to create the email opt-in list.
Merge pull request #5917 from edx/sarina/fix-i18n

Fix Solutions i18n issues
Merge pull request #6110 from edx/will/email-opt-in-analytics

Add management command to create the email opt-in list.
Change the default dir for loading xml files.
This should always be overridden by the testcases if needed.