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

This reverts commit 718e7c35a19eb02f8254c69d5850d50f7f40bc9f.
Rebase from 'upstream'
Trimmed the branch to only the rqt_srv sub directory