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

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