Backport upstream fixes for cp

In some cases, cp doesn't handle symlinks due to the lack of checks, especially with symlinks pointing to directories. This has been fixed upstream so we backport the corresponding patches in this commit.