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

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