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

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