Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Forwarder tests: Replace null event json with valid one
  Add .apt_generated directory to .gitignore
  Update mockito-core to 2.24.0
  RestForwarderServletModuleIT: Add a cache wildcard endpoint test
  RestForwarderServletModule: Add missing wildcard to event endpoint

Change-Id: I60e2399e9ac00cf56f54c7e5d17544bfadea87d6