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

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