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

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