SAK-12397 svn merge -r123128:123127 (back out -r123128)

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