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

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