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

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