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

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