SAK-27491 - Announcement body missing in formatted part of notification - Also cleaned up plain text for SAK-23315


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