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

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