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

This reverts commit 92ae215afae212abcf8bc6eb76871cc7f58f74bb.
Rebase from 'upstream' @ version '0.2.9'
Trimmed the branch to only the rqt_srv sub directory