Relate a on omni master to be on edge with latest gateway changes
Merge pull request #1 from pilot/omni-master

Relate a on omni master to be on edge with latest gateway changes