SAK-26630 merge r310834 from trunk


git-svn-id: https://source.sakaiproject.org/svn/roster2/branches/sakai-10.x@312800 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-27853 merge r312692 from trunk


git-svn-id: https://source.sakaiproject.org/svn/roster2/branches/sakai-10.x@312801 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-27837 merge r312345 from trunk


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