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

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