SAK-25344 - reverse merged to ensure osp trunk builds fine

git-svn-id: https://source.sakaiproject.org/svn/osp/trunk@131075 66ffb92e-73f9-0310-93c1-f5514f145a0a