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

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