Merge branch 'stable-3.11'

* stable-3.11:
  Make the event store directory configurable

Change-Id: Icd8edc1f07367be40d596aa986f10554d2133cbf