CDH-10438: Paramterize repos and fix repo version switch bug
Merge branch 'graham-patch-CDH-10439' into graham-release-001