Fix indirect import in webgateway (dev_5_0)

Remove unused import from gateway and fix indirect imports of that name

--rebased-from #2280