Merge pull request #2287 from learningequality/nalanda-rct2

Nalanda rct2 into central-master
Merge branch 'nalanda-rct2' into central-master
Directly import sha_constructor from hashlib to avoid Django warning.
Merge pull request #2296 from learningequality/central-master

A few changes from central-master