ISTWCMS-5337 Fix functional test issue after merge all project work
requested to merge feature/ISTWCMS-5337-l26yan-Fix-functional-test-issue-after-merge-all-project-work into 3.1.x
ISTWCMS-5337 Fix functional test issue after merge all project work