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

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