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

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