merge binpkg file changes instead of replacing the contents set

Previously binpkg merges would only merge the files from the binpkg
since the content sets were being entirely overridden. Now symlinks,
dirs, fifos, and the rest of the irregular file types are merged
properly.