Merge "Fixed transaction error while undeleting revdeleted files"