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

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