Committing changes from UWO's msub related to SAK-26322 and SAK-2319


git-svn-id: https://source.sakaiproject.org/svn/assignment/branches/SAK-26318@310368 66ffb92e-73f9-0310-93c1-f5514f145a0a