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

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