refs #30828
refs #30828
Merge remote-tracking branch 'origin/features/portlet-design'

Conflicts:
	war/src/main/webapp/themes/default/css/aui.css