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

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