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

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