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

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