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

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