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

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