SAM-2274 SAM-2368 revert 311366 from 10.x

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