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

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