ASNN-821 - de-trunkify branch

git-svn-id: https://source.sakaiproject.org/contrib/assignment2/branches/sakai-2.8.x@83868 fdecad78-55fc-0310-b1b2-d7d25cf747c9
ASNN-821 - de-trunkify branch

git-svn-id: https://source.sakaiproject.org/contrib/assignment2/branches/sakai-2.8.x@83869 fdecad78-55fc-0310-b1b2-d7d25cf747c9