Rebase of openafs-osd

I rebased the code to the current state in git.openafs.org/openafs.git.