Make it branch agnostic

LMS-11210

already reviewed in https://github.com/edx/edx-platform/pull/4836 but against reruns/ui