Merge pull request #3816 from cpennington/ok-psychometrics

Fix PsychometricData query
Fix certificate requests
Merge pull request #3814 from cpennington/ok-conditional-test

Fix ConditionalTest test system
Merge pull request #3812 from cpennington/ok-simpler-loc-mapper

Make the arguments to translate_location_to_course_locator more specific
Deprecate old ORA; add links to new ORA permanent docs
Merge pull request #3811 from cpennington/ok-dont-use-empty

Don't use Empty directly, let the manager handle it
Merge pull request #3579 from edx/andya/container-add-buttons

Allow creation of components on container page
Merge pull request #3765 from edx/sylvia/docs/TIM-243

Sylvia/docs/tim 243
fixup! Fix management commands
Merge pull request #3809 from cpennington/ok-dead-code

Remove dead code
Merge pull request #3808 from cpennington/ok-course-mode-errors

Call other CourseModeView methods using serialized course_id
Merge pull request #3806 from edx/dhm/opaque_migrate_0036

Migration for role_coursenum deprecated roles
Serial number commands deserialize course keys
Merge pull request #3708 from edx/clytwynec/rake2paver-quality

Switch quality tasks to paver
Added asserts to ensure course_ids are course key objects.
Validate forms to allow old and new style course key serialization syntax
Merge pull request #3813 from cpennington/ok-mongoengine-fields

Make mongoengine field for UsageKeys expect a Location
Merge pull request #3807 from cpennington/ok-cleaner-logging

Clean up logging in import_export.py
Merge pull request #3815 from cpennington/ok-certificaties

Fix certificate requests
Merge pull request #3810 from cpennington/ok-management-commands

Fix management commands