Merge branch 'stable-2.16'

* stable-2.16:
  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: Iaf29df102ab4c3695970f6fcabbceb1e3d09cb02