Merge "Scan renamed oldPath to remove db rows of directories in oldPath" into rvc-dev