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

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