fixes for restoring folder resource roots
Merge pull request #984 from devoncarew/devoncarew_ws_fixes

fixes for restoring folder resource roots