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

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