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

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