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

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