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

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