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

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