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

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