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

This reverts commit 3c3086a4942570f27d7970e30a3e5ba49bd741df.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the rosapi sub directory