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

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