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

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