KNL-1042 Tweaks to ensure objects have a URI most of the time

git-svn-id: https://source.sakaiproject.org/svn/kernel/trunk@122951 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1043 Fixed up the content events

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