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

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