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

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