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

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