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

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