Revert "Trimmed the branch to only the multimaster_fkie sub directory"

This reverts commit 160fa5ce1c4e7a65415c8e094f67e7c03e5a9a40.
Rebase from 'upstream'
Trimmed the branch to only the multimaster_fkie sub directory