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

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