fixes
undoing local tests #5320
Merge pull request #5378 from dotCMS/issue-5320-upgrade-from-2.5.4-errors

Issue 5320 upgrade from 2.5.4 errors