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

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