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

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