SAK-27793 merge 312012 from trunk

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