Handle Unicode for Incoming Keys
Handle unicode through try catch
Enforce pylint violation when using old event tracker.
Mock the modulestore for the heartbeat tests
Merge pull request #6104 from edx/zoldak/heartbeat-mock-tests

Mock the modulestore for the heartbeat tests
Clean up all modulestore testcases
Move modulestore config for tests to an importable location
Disable pylnt warning for lms imports in common tests
Refactor all testcases that loaded all xml courses
TE-610
TE-489
Small fixes to modulestore test refactoring
Merge pull request #5888 from Shrhawk/shr/bug/TNL-590-encode-error

Handle Unicode for Incoming Keys
Merge pull request #6078 from edx/zoldak/modulestore-test-refactor

Clean up all modulestore testcases
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