SAM-2096 merge r121789,r127073 from trunk


git-svn-id: https://source.sakaiproject.org/svn/sam/branches/samigo-2.9.x@127581 66ffb92e-73f9-0310-93c1-f5514f145a0a