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

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