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

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