Merge "Correctly resolve realpath for absolute paths"