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

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