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

This reverts commit bf33ae8ae22e95468140c5d33c8e8bb0f155377a.
Rebase from 'upstream'
Trimmed the branch to only the master_discovery_fkie sub directory