GRAILS-10744 - start reducing dependence on the upgrade command