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

This reverts commit 4d0afc1d7fb949356ad9222821ff0d4eed3e40f2.
Rebase from 'upstream'
Trimmed the branch to only the rosserial_server sub directory