KNL-1051 merge fixed (removed old SiteAction stuff)



git-svn-id: https://source.sakaiproject.org/svn/site-manage/branches/sakai-2.9.x@122999 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1051 merge r123001



git-svn-id: https://source.sakaiproject.org/svn/site-manage/branches/sakai-2.9.x@123003 66ffb92e-73f9-0310-93c1-f5514f145a0a