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

This reverts commit a24762f0c1321b008cf4c66e79502c01c47a2035.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the master_discovery_fkie sub directory