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

This reverts commit 34828cc4c40f7372beb4bd9f9052c6a16c31cecc.
Rebase from 'upstream'
Trimmed the branch to only the rosbridge_server sub directory