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

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