SAK-21957 merge trunk r106018 but it conflicted, so took the properties mods from r106590

git-svn-id: https://source.sakaiproject.org/svn/assignment/branches/sakai-2.8.x@118626 66ffb92e-73f9-0310-93c1-f5514f145a0a