Add missing imports, undefined variable fix
Merge pull request #2205 from knabar/fix-webgateway-missing-imports

Add missing imports, undefined variable fix
Merge remote-tracking branch 'origin/develop' into webstart_index_template