KCINFR-979: making s2s error messages end user maintainable

I don't see any bootstrap DML to replace this?