refs #29861
refs #29861
refs #29861
refs #29867
Merge remote-tracking branch 'origin/features/todo-secreticon'

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