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

This reverts commit 27a386d96ebc783a437c18e540f95726c9e4cee9.
Rebase from 'upstream'
Trimmed the branch to only the gateway_msgs sub directory