SAM-2028 merge r116886,118113,121796 from trunk


git-svn-id: https://source.sakaiproject.org/svn/sam/branches/samigo-2.9.x@122150 66ffb92e-73f9-0310-93c1-f5514f145a0a
NOJIRA cleaning up bad svn:mergeinfo on these folders


git-svn-id: https://source.sakaiproject.org/svn/sam/branches/samigo-2.9.x@122151 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAM-2106 merge r121757 from trunk


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