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

Fix indirect import in webgateway