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

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