SAK-22177 merge grunk r108111, 108112

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