KNL-1173 Reverse-merging r305985 to fix the broken build



git-svn-id: https://source.sakaiproject.org/svn/kernel@305996 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1173 Also reversing out the change I accidently committed, doh




git-svn-id: https://source.sakaiproject.org/svn/kernel@305998 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1178 Allow controlling the type when adding new notifications



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