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

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