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

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