Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Fix so that GWTUI js file is not executed under PolyGerrit

Change-Id: I9b5e59bb31cc7de07cf863af7baebe556e8f494f