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

This reverts commit 2da319cbcf83420eefc10b5a05b4a3259cd1d135.
Rebase from 'upstream' @ version '1.9.41'
Trimmed the branch to only the test/test_rospy sub directory