Revert "Trimmed the branch to only the test/test_rosservice sub directory"

This reverts commit b1612672700f8bbc18cc4ccdeb5b897280faec07.
Rebase from 'upstream' @ version '1.9.40'
Trimmed the branch to only the test/test_rosservice sub directory