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

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