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

This reverts commit 650f4207669bc53dfcb39a473e24a8389288a71c.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the master_discovery_fkie sub directory