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

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