Hotfix course_specific_reg/login for OpaqueKeys
Merge branch 'jbau/course-specific-login-hotfix' into rc