SAK-27937 - Fixed a merge for a feature only in Sakai 11


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