fixes for restoring folder resource roots

TBR, fixes to the new workspace root code.

@keertip