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

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