Merge branch 'stable-3.12'

* stable-3.12:
  Make the event store directory configurable

Change-Id: I44c875503c6419c960ea1aaadc232d2c7767032c