Remove unused import from gateway and fix indirect imports of that name
Merge pull request #2281 from knabar/fix-timeit-import-dev50

Fix indirect import in webgateway (dev_5_0)