Gateway Infrastructure Field Should Be Omitted from Marshaling

[danehans]

What happened:
The Gateway infrastructure field is defined as optional, but it's still being marshaled to JSON.

What you expected to happen:
For this field to be omitted from JSON marshaling.

How to reproduce it (as minimally and precisely as possible):
N/A

Anything else we need to know?:
N/A

[danehans]

/assign