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

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