fixup! Make course ids and usage ids opaque to LMS and Studio [partial commit]

Conflicts:
	lms/djangoapps/courseware/models.py