refs #30573
Merge remote-tracking branch 'origin/bugfix/note-mailicon-position'

Conflicts:
	portlets/note/src/main/webapp/WEB-INF/templates/vm/portlets/html/ajax-note-detail.vm
	portlets/note/src/main/webapp/WEB-INF/templates/vm/portlets/html/ja/ajax-note-detail.vm