SAK-27952 Merge 313993 from trunk

git-svn-id: https://source.sakaiproject.org/svn/roster2/branches/sakai-10.x@315043 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-27991 Merge 314511 from trunk

git-svn-id: https://source.sakaiproject.org/svn/roster2/branches/sakai-10.x@315044 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-27993 Merge 314973 from trunk

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