SAM-1468 merge trunk r108724

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/samigo-2.8.x@118947 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAM-1556 merge trunk r113744

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/samigo-2.8.x@118949 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAM-1748 change location of feedback message string

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