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

This reverts commit e42c675fa53fcbeb02838689c4a74eb551dfd411.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the rosbridge_server sub directory