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

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