#4218 added the fields just before they're needed
Merge pull request #4229 from dotCMS/issue-4218-upgrade-from-19-broke

#4218 added the fields just before they're needed