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

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