Namespace re-org fixes
add edgeGateway support
edgegw