add test proving that the change fixes the problem with ResourceWatcher
Merge branch 'issue633' into 1.6.x