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

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