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

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