Backport change from gerrit #2147 to fix tests

Change-Id: I9e54f364be4cb1df54e56e77c13c9834cca6bbd7
Merge commit 'refs/changes/95/2195/1' of ssh://gerrit.tuleap.net:29418/tuleap into tuleap-stable-master

* ssh://gerrit.tuleap.net:29418/tuleap:
  Backport change from gerrit #2147 to fix tests

Change-Id: I2a614d8c5cd9e06f0097c12cda8042f5c31ab388
Tuleap 6.11.99.35

Change-Id: I97664c8de7a92d2d27b4df6d763208a2c6538fa6