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

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