SAK-27824 revert 315235 merge of 312278, 315157 from trunk

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