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

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