fixes #3044 #2304 #3081 #3054
Merge branch 'select/release' of github.com:Man2Life/edx-platform into select/release