SAK-22976 - Reverse Merging 122616 and 122652, as it's currently breaking startup


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