NOJIRA removing bad svn:mergeinfo


git-svn-id: https://source.sakaiproject.org/svn/content/branches/sakai-2.9.x@122156 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-23378 merge r121550 from trunk


git-svn-id: https://source.sakaiproject.org/svn/content/branches/sakai-2.9.x@122157 66ffb92e-73f9-0310-93c1-f5514f145a0a