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

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