KCINFR-979: making s2s error messages end user maintainable

There is a bootstrap DML but it is too large to display in github.  Look at the files changed view