Initial edu-service changes for SAK-23787


git-svn-id: https://source.sakaiproject.org/svn/edu-services/branches/SAK-23787@130018 66ffb92e-73f9-0310-93c1-f5514f145a0a