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

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