Merge branch 'stable-2.13' into stable-2.14

* stable-2.13:
  Migrate plugin config to own configuration file

Annotate CacheEvictionIT as @Ignore again since it needs to be
adapted to the new plugin configuration. This will be done in a
follow-up commit.

Change-Id: I84618d0fe6c1ef8784b225d3f60b1b41560870f5