refs #33466
Merge remote-tracking branch 'origin/bugfix/wiki-list-config'

Conflicts:
	portlets/wiki/src/main/webapp/WEB-INF/templates/vm/portlets/html/ja/wiki-widgets.vm
	portlets/wiki/src/main/webapp/WEB-INF/templates/vm/portlets/html/wiki-widgets.vm