SAK-26262 merge 310063, 310094, 310972 to 10.x

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