Fix issue #1928
Fix issue #1932
Fix staff label font in discussion comments
#openended: added content disposition to S3 uploads and uuid as key
Merge remote-tracking branch 'origin/select/release' into select/release
#openended: revert last commit
#openended: try again Content Disposition
#openended: fixes proper boto s3
#openended: fixes proper boto s3
#openended: fixes s3 content
#masterclass: commit
#master class
Merge branch 'feature/master-class' of github.com:Man2Life/edx-platform into feature/master-class