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

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