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

This reverts commit 31ad8c516d97fa52ba0f9101fd69edd801008f82.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the gateway_msgs sub directory