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

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