Move the shared files into yocto-fixes/ and the files from master. The next step is maybe to remove the indirection again. We will see about it in the future.
Holger Hans Peter Freyther