Revert "Trimmed the branch to only the rosapi sub directory"

This reverts commit 4fccfe4a3a93bc394752b6663399c91b1cfee84c.
Rebase from 'upstream'
Trimmed the branch to only the rosapi sub directory