Bring in commit from develop that fixes webdav uuid overwrite bug