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

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