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

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