Merge "Use stat.st_dev for checking if two paths point at different filesystems" into rvc-dev