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

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