SAK-26265 this is a special-case commit to 10.x because of NOJIRA commits made to Roster2 trunk. Merge of 308071,308645 from trunk.


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