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

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