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

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