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

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