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

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