SAK-27503 merge 310840,311612 from trunk

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