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

This reverts commit 113960d6485b39d96149bce54320341b0b005b39.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the rosapi sub directory