SAK-25668 folder handling improvement

git-svn-id: https://source.sakaiproject.org/svn/content/branches/SAK-25668@134167 66ffb92e-73f9-0310-93c1-f5514f145a0a