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

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