Merge branch 'stable-2.16'

* stable-2.16:
  Fix auto-replay of stored events during config reload

Change-Id: I0c654b42af87ba9662ae01d328788e3d7794e810
tree: b94f37e58c503779d693a89c5ddfd9dc89ac3470
  1. .gitignore
  2. .mailmap
  3. .settings/
  4. BUILD
  5. LICENSE
  6. src/