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

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