SAK-26570 - Merge from trunk NPE from PDA portal web content tool URLs

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