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

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