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

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