SAK-23131 osp xml fixes



git-svn-id: https://source.sakaiproject.org/svn/osp/trunk@118351 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-23131 osp xml fix



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