SAK-26260 Merge 312289,312290 from trunk

git-svn-id: https://source.sakaiproject.org/svn/roster2/branches/sakai-10.x@315042 66ffb92e-73f9-0310-93c1-f5514f145a0a