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

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