KFSUPGRADE-972 moving our tag overrides to the correct new locations