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

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