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

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