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

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