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

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