refs #31673
Merge remote-tracking branch 'origin/features/project' into
features/project

Conflicts:
	portlets/project/src/main/webapp/WEB-INF/templates/vm/portlets/html/ajax-project-task-list.vm
	portlets/project/src/main/webapp/WEB-INF/templates/vm/portlets/html/ja/ajax-project-task-list.vm