SAK-25371 merge r132658, r132837 and r132862 into content trunk code

git-svn-id: https://source.sakaiproject.org/svn/content/trunk@133222 66ffb92e-73f9-0310-93c1-f5514f145a0a