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

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