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

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