Merge branch 'stable-3.10' * stable-3.10: Make the event store directory configurable Change-Id: I4d5dcf4ec4568635f5920c194a11a8d4b566f5cb