SAK-25862 merge 307330 307331 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/kernel@307514 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1211 - More types for antisamy ol and ul


git-svn-id: https://source.sakaiproject.org/svn/kernel@307531 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1200 Allow setting of Content-Disposition header on attachments.

This allows the content-disposition header to be set on email attachments sent through the sakai EmailService.

git-svn-id: https://source.sakaiproject.org/svn/kernel@307535 66ffb92e-73f9-0310-93c1-f5514f145a0a