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

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