Issue #2856619 by jhedstrom: Fixed failing tests due to core change with configurable plugins needing to merge default configuration.