Clean up of modulestore references (primarly LMS).

STUD-1151
Merge pull request #2562 from edx/christina/lms-mixed

Clean up of modulestore references (primarily LMS).