Merge branch 'issue834' into 1.7.x
Merge branch 'issue812' into 1.7.x
a resource is marked as checked only if the actual check is performed.
fix for issue511: resourceWatcher will check for changes in parallel when resourceWatcherAsync=true
fix merge conflicts