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

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