Reruns/cms server side LMS-11016

This PR is an updated version of this old one: https://github.com/edx/edx-platform/pull/4573
when is this TODO getting addressed? IF not now can you please indicate which ticket will address this?