SAK-27768 merge 311611, 311622 to 10.x

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