SAM-2128 merge trunk r122927 manual 29x patch

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