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

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