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

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