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

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