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

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