CLAMP-620 builds upgrade path to accommodate new settings keys
CLAMP-631 changes courselist to course_list in certain variable names
Merge remote-tracking branch 'github/wip-CLAMP-631_master'