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

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