Bring in fix for ResourcePool.flushDataStore() when processing cluster delete events in geoserver and geoserver-exts