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

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