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

This reverts commit bc1c67b0a0b9adf79d8ad70cd341e47519659ebf.
Rebase from 'upstream'
Trimmed the branch to only the rocon_gateway sub directory