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

This reverts commit 0a1adedef54c9093d783d39cab0a8bdcef3dce5a.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the rosbridge_server sub directory