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

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