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

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