SAK-23116 merge r118266 from trunk

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