Merge branch 'stable-3.1'

* stable-3.1:
  Remove left over project screen extension for GWT UI

Change-Id: Ibb951ec24c974677556773de7c9107b5d5831b5a