Reruns/cms server side LMS-11016

This PR is an updated version of this old one: https://github.com/edx/edx-platform/pull/4573
Caught by the caller.