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

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