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

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