Reorganize the demo classlist code, and classlist uploading

Colin Macdonaldrequested to merge
refactor_classlist_upload into master

On top of !1027 (merged), basically just some cleanup.

Bit confused about that mock test and whether its important, so I went through some hoops to make sure it still works...

  • This change does not need a changelog entry.

Merge request reports