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

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