Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  ProjectCreationValidatorIT: Fix expected substring

Change-Id: If04f7bb6f7656c40e29eec6a5f511790d1cf7452