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

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