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

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