Dhm/opaque keys bugs

Make Locators comply with UsageKey accessors

Flowerhack/fix discussion opaque

Opaque keys migrate

Conflicts:
	cms/djangoapps/contentstore/views/public.py
	common/djangoapps/external_auth/tests/test_ssl.py
	common/djangoapps/student/views.py
	lms/djangoapps/dashboard/sysadmin.py
	lms/templates/notes.html

Fix discussions by correctly serializing outgoing course_ids

Video: Fix acceptance tests.

Anton/fix video in ff

Modified ssl certificate authentication to handle next redirection

Remove unicode character inserted into video_xfields

Flowerhack/fix ora

allow capa problems access to anonymous_student_id

Reconnecting Token Generator for Annotation Tool

Conflicts:
	cms/djangoapps/contentstore/views/item.py
	cms/djangoapps/contentstore/views/tests/test_container.py
	cms/djangoapps/contentstore/views/tests/test_tabs.py
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	lms/djangoapps/certificates/management/commands/gen_cert_report.py
	lms/djangoapps/certificates/queue.py
	lms/djangoapps/certificates/views.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/tests/test_module_render.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor/views/legacy.py
	lms/djangoapps/shoppingcart/tests/test_models.py
	lms/djangoapps/verify_student/views.py

Improve the translatability of Studio's paging header

Adding additonal path to search for git information on sysadmin dashboard

Clarify strings for i18n

Fix delete cache so it also deletes location with run = None.

Fixes LMS-1740 by activating the zooming diagram with the spacebar.

Makes small changes in lms and cms both so that user's go to the
original page they intended to if they weren't already logged in