SAK-28090 Merge 315472,315497 from trunk

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