Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  ProjectCreationValidatorIT: Fix expected substring

Change-Id: Ide357f2639ea0d2731479923e043d0721d028da7