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

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