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

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