Merge "Have patchoat --verify verify symlinks"