Merge "Switch to BSD chown (for -R, primarily)."