DispatcherStreamLocator now can be injected. SchedulerHelper used by cacheStrategy to clear checked for modification keys is now destroyed when application is destroyed. ResourceWatcher uses a thread pool size of 2 for executor service responsible for async resource watch execution.
Update exception log message
Fix merge conflicts
fix merge conflicts