Merge pull request #2254 from raydavis/raywip

CLC-3442 All feeds should use course_code instead of some using course_number
CLC-2442 Distinguish classes with same catalog ID