Resolve 'uri' properties into unique folder object references representing the current state of the folder (#3667)