KNL-960 merge r118863 from trunk. Had to merge this to get the unset portal.neoprefix in.


git-svn-id: https://source.sakaiproject.org/svn/kernel@124889 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-23395 merged trunk r122221 and had to do some work by hand 


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