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

This reverts commit f712b9f2e66d12405331ffbd66d15972b84b449f.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the clients/rospy sub directory