Complete rebase updates related to Course Updates.
Merge branch 'db/requirejs' of github.com:edx/edx-platform into db/requirejs