Revert "Trimmed the branch to only the clients/rospy sub directory"

This reverts commit 7284af18581846041629e58b9a307fb36433b381.
Rebase from 'upstream'
Trimmed the branch to only the clients/rospy sub directory