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

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