SAK-25825 merge 306727 306728 to 10.x

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